From: Mukunda Modell <mmodell@wikimedia.org>
Date: Thu, 27 Aug 2015 19:28:51 +0000 (-0500)
Subject: Don't free the parser in the catch() block of parse()
X-Git-Tag: 1.31.0-rc.0~10206^2
X-Git-Url: http://git.cyclocoop.org//%22http:/%22.attribut_html%28%24lesurls%5B%24numero%5D%29.%22/%22?a=commitdiff_plain;h=284a94804133d18e9c23d837fc8362eade7f08ea;p=lhc%2Fweb%2Fwiklou.git

Don't free the parser in the catch() block of parse()

This is the solution proposed by @bd808 to address T89532, also, it's
completely untested.

Bug: T89532
Change-Id: I9b5b47eb9d64a3d80f9c49618a362415d15071b4
(cherry picked from commit d34ed1acbe2ea58e5de59d3a18e278be0e384f8f)
---

diff --git a/includes/media/XMP.php b/includes/media/XMP.php
index 12550a59ef..5ded976e4f 100644
--- a/includes/media/XMP.php
+++ b/includes/media/XMP.php
@@ -380,10 +380,6 @@ class XMPReader implements LoggerAwareInterface {
 		} catch ( Exception $e ) {
 			$this->logger->info( 'XMP parse error: ' . $e );
 			$this->results = array();
-
-			if ( $allOfIt ) {
-				$this->destroyXMLParser();
-			}
 			return false;
 		}
 		if ( $allOfIt ) {